From 4e6f46cf102df93bd4baa70950579ad2f04ffb0e Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 29 Jul 2005 10:27:12 +0000 Subject: [PATCH] This patch updates the CPU field in xm list for multi-vcpu domains. When a dom runs on multiple physical cpus, the CPU field doesn't have much meaning. The suggested fix was to replace the value with '-'. Signed-off-by: Ryan Harper --- tools/python/xen/xm/main.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py index 8f8c757e31..a831cde8aa 100644 --- a/tools/python/xen/xm/main.py +++ b/tools/python/xen/xm/main.py @@ -397,7 +397,7 @@ class ProgList(Prog): d['dom'] = int(sxp.child_value(info, 'id', '-1')) d['name'] = sxp.child_value(info, 'name', '??') d['mem'] = int(sxp.child_value(info, 'memory', '0')) - d['cpu'] = int(sxp.child_value(info, 'cpu', '0')) + d['cpu'] = str(sxp.child_value(info, 'cpu', '0')) d['vcpus'] = int(sxp.child_value(info, 'vcpus', '0')) d['state'] = sxp.child_value(info, 'state', '??') d['cpu_time'] = float(sxp.child_value(info, 'cpu_time', '0')) @@ -406,12 +406,14 @@ class ProgList(Prog): d['port'] = sxp.child_value(console, 'console_port') else: d['port'] = '' + if d['vcpus'] > 1: + d['cpu'] = '-' if ((int(sxp.child_value(info, 'ssidref', '0'))) != 0): d['ssidref1'] = int(sxp.child_value(info, 'ssidref', '0')) & 0xffff d['ssidref2'] = (int(sxp.child_value(info, 'ssidref', '0')) >> 16) & 0xffff - print ("%(name)-16s %(dom)3d %(mem)7d %(cpu)3d %(vcpus)5d %(state)5s %(cpu_time)7.1f %(port)4s s:%(ssidref2)02x/p:%(ssidref1)02x" % d) + print ("%(name)-16s %(dom)3d %(mem)7d %(cpu)3s %(vcpus)5d %(state)5s %(cpu_time)7.1f %(port)4s s:%(ssidref2)02x/p:%(ssidref1)02x" % d) else: - print ("%(name)-16s %(dom)3d %(mem)7d %(cpu)3d %(vcpus)5d %(state)5s %(cpu_time)7.1f %(port)4s" % d) + print ("%(name)-16s %(dom)3d %(mem)7d %(cpu)3s %(vcpus)5d %(state)5s %(cpu_time)7.1f %(port)4s" % d) def show_vcpus(self, doms): print 'Name Id VCPU CPU CPUMAP' -- 2.30.2